Merge pull request #45 from cyrille-leclerc/master

minor fix and docs
Merge pull request #46 from cyrille-leclerc/master

minor enhancements
Merge pull request #47 from cyrille-leclerc/master

Add unit test
Merge pull request #19 from jmxtrans/master

merge