Fix issue #88
Merge pull request #111 from s1n4/issue-88

Fix issue #88