[Fix] Build
Merge pull request #155 from jmpascal/master

[Fix] Build