Merge pull request #58 from CKHuang/master