0614 update
Merge branch 'master' of https://github.com/wuxinwei/TestCode