Fix issue #86
Merge pull request #91 from avaloni/master

Fix issue #86