Fixed several inconsistencies related to code style
Merge pull request #6 from oliversalzburg/fix/code-style

Fixed several inconsistencies related to code style