Style fixes
Merge pull request #39 from dalen/master

Style fixes