WIP of styling comments
Merge branch 'master' into style-comments
Merge branch 'wip' into style-comments
style comments a little bit. Fixes #45