Merge pull request #9 from tillarnold/master

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

Merge pull request #9 from tillarnold/master