Merge pull request #37 from cyrille-leclerc/master

rollback to snapshot
Merge pull request #8 from jmxtrans/master

merge