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

Add collectd support