Style changes
Merge pull request #49 from IGlautier/master

Style changes