Merge pull request #17 from tillarnold/master

Merge
Merge pull request #20 from tillarnold/branch-3.1-dev

Merge pull request #17 from tillarnold/master