fix #7
fix #7
Merge branch '7'
v4.1.300