Merge commit 'fc841b4b4c10f7a761063c4d21971b1613d9b271'

Conflicts:
	bin/compile
added slash