merge calculator in dev

Seems you just want to wrap calculators into a class. It will make more sense to using staticmethods.