misc
Merge branch 'master' into v1.0
Merge branch 'master' into v1.0
merge with 1.0