Bug fixing

Fixed MOBILE-1420, fixed MOBILE-1411
Merge pull request #79 from ldjagger/master

Bug fixes and resolved crash situation on phone sized resources