Merge pull request #5 from collectd/master