Merge https://github.com/P1start/rcalc into P1start-master
Merge branch 'P1start-master'
Merge branch 'master' of github.com:libfud/rcalc

Trying to un-screw this up.