Merge pull request #13 from tillarnold/master

merge
Merge pull request #18 from tillarnold/branch4

Merge pull request #13 from tillarnold/master