Merge pull request #8 from collectd/master