ethan update and fix
Merge branch 'master' into ethan
merge master
ethan fix
ethan update scene