Merge pull request #2 from crumblingstatue/master

Merge me