Force all operands to be of the right type
Merge branch 'issue-115' into develop

Closes #115