Merge pull request #8 from monttj/master

merge test
Merge pull request #1 from kopfa/master

Merge pull request #8 from monttj/master