Merge pull request #1 from changhu2013/master

合并更新