2
Merge pull request #2 from yaolei/ios_2