Merge https://github.com/Matt-Herbstritt/calculator