Merge pull request #40 from liaojia/master

pull
STH
yao
Merge branch 'master' of github.com:suntinghui/LKOA4iPhone
Merge pull request #32 from suntinghui/master

pull