MOBILE-1309
Merge pull request #65 from jmpascal/master

MOBILE-1309