Reflect 1.4.1 changes
Merge pull request #241 from jmpascal/MERGING-1

Reflect 1.4.1 changes