pull request from Zhangbin

pull request from Zhangbin