Removed use of 32-bit math types (in support of #13 and #14)