MOBILE-1579
Merge pull request #89 from jmpascal/master

MOBILE-1579