Revert "merge"
Merge pull request #42 from qatang/revert-41-master

Revert "merge"