Merge pull request #1 from xymus/calculator