fixed bug on master
Merge branch 'master' into r2_demo
release 2