Change the types of some arithmetic operations.
Merge pull request #17 from dcjones/arithmetic

Change the types of some arithmetic operations.