this is maxs part
Merge branch 'master' of github.com:max888/CalcIt