Reworks support for null used in arithmetic. Fixes #159
Merge pull request #162 from tessel/tcr-159

Reworks support for null used in arithmetic. Fixes #159