add small fixes to have the test.php file running with the changes as
well
Merge branch 'hummel_merge' of github.com:rmspatches/chameleon into hummel_merge

Conflicts:
	test.php