check in
Merge pull request #1 from jikang1985/master

check in