add more lib functions
test conflict
resolved conflict
add comments , code complete
Merge branch 'r2_calc'