changed ia and rbard to be hardcoded [ci skip]
Switched back to the equation format. [ci skip]
Merge branch 'master' into devel [ci skip]

Conflicts:
	DESCRIPTION