Issue #82 fix.
Fix for issue #86
Fixed broken test
Merge pull request #84 from lyncodev/issue82

Issue #82 fix [trunk]
Merge pull request #89 from lyncodev/issue86

Fix for issue #86 [trunk]
Update README.md
Fixed pom.xml for the next releases