Merge pull request #24 from jmpascal/master

MOBILE-1292
Merge pull request #25 from jmpascal/master

[REVIEW]MOBILE-1149+MOBILE-1144