add Calculator class, update globals based on it
Merge pull request #56 from talumbau/calc_class

add Calculator class, update globals based on it