Initial caclulator development.
Merge pull request #1 from jpbarela/initial_calculator_rebase

Initial caclulator development.