added automatic integer conversion (c.f. issue #527)
Merge branch 'next' into 527_integer_float_fix