first commit for dev
merge dev to master

Conflicts:
	test.cpp
fix a bug on merged