             currentOperand = operand
         } else {
             currentOperand += operand
+        }
+        
+        if storedOperator == .Equal {
+            currentOperand = operand
+            storedOperator = nil
         }
         
         if automaticDecimal {

            case .Add:
                output = value1 + value2
            case .Equal:
                return previousOperand
            default:
                break
            }
            previousOperand = formatValue(output)
        }
        currentOperand = resetOperand()
        storedOperator = .Equal
        return previousOperand
    }
    
    func clearAll() -> String {

    func storeOperator(rawValue: Int) -> String {
        if storedOperator != nil && storedOperator != .Equal {
            previousOperand = computeFinalValue()
        } else if storedOperator == .Equal && rawValue == CalculatorKey.Equal.rawValue {
            return currentOperand
        } else {
            previousOperand = currentOperand
        }
