Replace troublesome arithmetic operators
Merge pull request #610 from stevensons/cut-safe-additions

Replace troublesome arithmetic operators