Merge pull request #24 from cyrille-leclerc/master

new configuration style for "enabled" flag
Merge pull request #5 from jmxtrans/master

merge