Fixed bug v1.1
Merge branch 'master' into r2_main
Ready for v2