Fixed code style
Merge pull request #782 from florianv/code-style

Fixed code style