Implemented Calc.sub method.

Implemented Calc.sub method with unit tests.
minor mods
Merge branch 'echampio-master'