2
Merge https://github.com/ddunker/calc