Make code style more or less consistent
Merge branch 'master' into code-style
More code style changes
Merge pull request #316 from allending/code-style

Make code style more or less consistent