Tested geo error on ipad. Not tested on phone yet
Merge remote-tracking branch 'origin/WorkingBranch'