Added Calculator class.