Merge pull request #7 from hgschmie/master

make auto assimilation work with the logging component
checkstyle & tab fixes