revert last commit and do it better
do even it better
Merge pull request #59 from leigh123linux/calculator

revert last commit and do it better