Merge pull request #80 from CKHuang/master

获取更新
Merge pull request #63 from jun-lu/master

获取跟新