Final version Calculator
final commit