edit by linliu
Merge pull request #5 from 9sheng/develop

edit by linliu