update the Calculate method
Merge branch 'master' of https://github.com/tonymazn/test
Update Calculate Method