Fixes issue 105
Merge pull request #110 from bparadie/fixes-105

Fixes issue 105