update #11
fix #3, #11, #7
v1.10