Merge pull request #2 from simonpasquier/add-collectd-support

Add collectd support