remainder support
trivial change
fixed conflict
conflict branch
line conflict
Merge branch 'conflict'

Conflicts:
	maths_functions.c
conflict fixed