fix in calculator
Merge branch 'master' of https://github.com/mohamedsamir92/Test