Now fully working for basic arythmetic. More equations soon.
Merge remote-tracking branch 'origin/master'