Merge pull request #487 from iamqizhao/master

some missing comments