Merge branch 'patch-1'

Conflicts:
	bin/compile