Merge pull request #7 from jmxtrans/master

merge
rollback to snapshot
Merge pull request #37 from cyrille-leclerc/master

rollback to snapshot