Set basic Calculator
Merge pull request #6 from Qiriqoo/basic-improvements

Set basic Calculator