fixes #17
Merge pull request #55 from twillouer/issue17

fixes #17