Merge pull request #1 from jikang1985/master

check in
Merge pull request #2 from jikang1985/release1

pull from release