Some straight forward coding style changes
Merge pull request #14 from alexander-zimmermann/master

Some straight forward coding style changes