[Fix] Style + build
Merge pull request #153 from jmpascal/master

[Fix] Style + build