MOBILE-1951 / MOBILE-1955
Merge pull request #65 from jmpascal/master

MOBILE-1951 / MOBILE-1955