Fix for issue #204
Merge pull request #214 from ichdasich/master

Fix for issue #204