Merge pull request #19 from tillarnold/master

Merge
Merge pull request #21 from tillarnold/branch3

Merge pull request #19 from tillarnold/master