Merge pull request #14 from tillarnold/master

merge
Merge pull request #15 from tillarnold/branch-3-dev

Merge pull request #14 from tillarnold/master