ref #86 - more unit tests
Merge pull request #91 from dimzon/fix-issue-86

ref #86 - more unit tests