Merge pull request #58 from CKHuang/master

update
Merge pull request #75 from CKHuang/jun-lu-master

Merge pull request #58 from CKHuang/master