refactor
Merge branch 'master' of https://github.com/wingkit82/iphone
refactor