Fix issue #197
Merge pull request #205 from Prillan/issue197

Fix issue #197