Fixes issue 102
Merge pull request #108 from bparadie/fixes-102

Fixes issue 102