Merge pull request #13 from tillarnold/master

merge