Some coding style nomalization.
Merge pull request #163 from oliverschmidt/master

Some coding style nomalization.