update
Merge https://github.com/docdocdoc/doctor_iPhone