First revision of the Calculator
Moved to command-line based execution
Adding erroneous check
Added comemnts