bug fix
Merge branch 'master' of https://github.com/quiga/ios01