#4370 fixed commit
Merge pull request #5 from pipu/#4370

#4370 fixed commit