Fix issue 34 on Github
Merge pull request #114 from mdk142/issue34

Fixes #34