Merge pull request #6 from jmxtrans/master

merge
Merge pull request #25 from cyrille-leclerc/master

merge