Fix for MOBILE-1555
Fix for MOBILE-1575
Merge pull request #86 from ldjagger/master

Fix for MOBILE-1555