[QA Fix]
Merge pull request #126 from jmpascal/master

[QA Fix]