Added new implementation of the calculator