Merge pull request #6 from collectd/master