[Fix] Fix & clean
Merge pull request #193 from jmpascal/1.4-Dev

[Fix] Fix & clean