code conventions
Merge pull request #146 from joernhees/code_conventions

code conventions