bug fix v1.1 for porduction
Merge branch 'master' into r2_morecalc
add final feature to Numbers.java, code complete