reviewed by chenwenli
Merge pull request #145 from chenwenli/master

reviewed 14 charpt five files