minor fixes CalculationModel
Merge pull request #17 from fssaez/master

pull