Merge pull request #3 from collectd/master