Merge pull request #17 from tillarnold/master

Merge