Merge branch 'layerfix' into mod_all

Conflicts:
	README.md