add Calculator, correct source.cpp