MOBILE-1587
Merge pull request #92 from jmpascal/master

MOBILE-1587