API updates for calculator
Merge pull request #6 from snogcel/master

API updates for calculator