Initial commit
Merge https://github.com/cscuderi/calc