Merge pull request #477 from iamqizhao/master

fix some comments and function names