Fix Calculator
Merge pull request #36 from danielang/master

Fix Calculator