Merge pull request #36 from cyrille-leclerc/master

version 1.0.4
Merge pull request #7 from jmxtrans/master

merge