Add calculator
Merge pull request #2 from execter/newfeature

Add calculator