Merge pull request #61 from AxTheB/master