[Sync] Sprint 2 Week 2
Merge pull request #183 from jmpascal/1.4-Dev

[Sync] Sprint 2 Week 2