dev branch
merge from dev branch to master

Conflicts:
	test.cpp