Merge pull request #121 from CKHuang/master

get update
update 24 25
Merge pull request #107 from jun-lu/master

get update