Merge pull request #62 from AxTheB/master