Some moinor modifications.
More modifications.

Conflicts:
	src/Iconfig/Config.php