Merge pull request #27 from linzhenlong/linzl_140529

覆盖最新代码到github