fixes #152
Merge pull request #173 from jeremyquinton/152

fixes #152
Merge branch 'hotfix/173'

Close #173
Fixes #152