Issue #84 fixed
Merge pull request #86 from thevar1able/master

Issue #84 fixed