add timmjd's commit
Merge pull request #751 from linshun/iss1665_v2.1.1

add timmjd's commit