Fix for issue #86
Merge pull request #88 from RomanTsegelskyi/issue86

Fix for issue #86