Merge pull request #54 from heyongjian/ios-style

merge pull request