Merge pull request #401 from iamqizhao/master

some cleanup