Merge branch 'master' of github.com:Jmoati/Companion

Conflicts:
	src/Companion/Compiler.php