init added
hide added
Merge branch 'master' into firstBranch

Conflicts:
	test.cpp