Merge pull request #5 from alexander-zimmermann/master

nits - Coding style