Merge pull request #27 from jarvys/master

适配iphone
Merge remote-tracking branch 'upstream/master'