Last adjustments
Merge branch 'master' of https://github.com/jtait/MobileProject