Merge pull request #1 from vadim-kovalyov/master

I added some tests for your calculator. Please implement the Calculator ...
Done Calculator
Bug fixes, code cleanup