Merge pull request #1 from Shengliang/master

Update my branch