shift Calculator class created
Merge branch 'master' into r2_index
table order class added