Merge pull request #72 from AxTheB/master