Merge pull request #7 from jklimke/master

merge master
Merge pull request #2 from jklimke/develop

Develop