Calculator
Merge pull request #23 from ryanroberts1983/feature/mgamboa/2014-10-01/calculators

Calculator