adding
Merge https://github.com/phased90/calc