update
update issue#6
solv issue#6
update 1.7