merge 4

mersfksfdasdfds
fdasdf
afd
Merge pull request #4 from jikang1985/release1

merge 4