Merge pull request #48 from AxTheB/master