Fix issue #199
Merge pull request #209 from Prillan/issue199

Fix issue #199