Code style 2
Merge pull request #99 from florianv/cs2

Code style 2