Merge pull request #80 from AxTheB/master