Fix issue #89
Merge pull request #90 from stepinto/master

Fix issue #89