Merge pull request #57 from AxTheB/master