bug fixed version 1.0 for production
Merge branch 'master' into r2_enhance
Added notes, completed coding