update issue#6
Merge branch 'issue#6' into 1.7