Merge pull request #65 from AxTheB/master