Merge pull request #43 from cyrille-leclerc/master

merge
Merge pull request #15 from jmxtrans/master

merge