Merge pull request #9 from tillarnold/master

pull