Changed method calc to do what it's meant to
Merge branch 'master' of https://github.com/xiaobai/M2
Merge branch 'master' of github.com:xiaobai/M2