Rh < Rb as well.

Also, makefile fix for better compilation time on code.o
Merge branch 'issue-stoke-36' into develop

Conflicts:
	Makefile