commit lantao's codes first, then do review
Merge pull request #15 from ErikFang/master

commit lantao's codes first, then do review