fixes #171
Merge pull request #225 from jeremyquinton/bug-fix-issue-171

fixes #171
Merge branch 'hotfix/225'

Close #225