Revert "merge"

This reverts commit c484229d8efd514d29fa4a8f69f8752a716fd00b.
Revert "Revert "merge""

This reverts commit 896b3f4db72a6127089c86df3142432e6be4273a.
Merge pull request #63 from CKHuang/master

test