[Fix] Build + extension
Merge pull request #154 from jmpascal/master

[Fix] Build + extension