Merge pull request #19 from tillarnold/master

Merge