Merge branch 'master' of https://github.com/krisznal/calc.git