Merge pull request #46 from AxTheB/master