Merge pull request #58 from AxTheB/master