Update from_collectd

merge gone wrong...
Merge pull request #4 from yoe/patch-1

Update from_collectd