General changes to codestyle and formatting
Merge pull request #1 from ChristopheMees/changesBranch

General changes to codestyle and formatting