Merge pull request #76 from jun-lu/master

update2
Merge pull request #77 from jun-lu/CKHuang-master

Merge pull request #76 from jun-lu/master