Added class MyCalc
Merge origin/master