pull_request from ChunleiGuo
Merge pull request #103 from ChunleiGuo/master

pull_request from ChunleiGuo