Style fixes
Merge pull request #87 from silvolu/master

Style fixes