minor bug fixes. will create new branch for the rest
Merge branch 'design/option2' of https://github.com/dzimine/collectd3 into design/option2