Exercise: improve the calculator


Improve the calculator to handle more operations