Fix makedir path
Merge remote-tracking branch 'origin/master' into shell

Conflicts:
	CMakeLists.txt