Merge pull request #89 from jun-lu/master

get update
submit edit
Merge pull request #102 from CKHuang/master

submit edit