newest master commit
bug fix, v 1.1 for production
commiting r2_main
merge conflict resolved
completed coding