iphone minor fixes
Merge branch 'movember' of github.com:jodaka/marlin into movember