simplify pack
Merge branch 'master' into ws1314_1

Conflicts:
	CMakeLists.txt
fix cmake