Merge pull request #7 from sguha-cn/sguha-cn

step4 done
step 5 done