Merge branch 'Johnny' into jhow-dev
I/S-Concatenation test ok
Modified depth purning
Merge branch 'jhow-dev' into Johnny

Conflicts:
	function.cpp