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

Fixed code style