Added methods to Calculator.m