fix a dev bug
master fix
dev fix
Merge branch 'dev'

Conflicts:
	test.cpp
master fix2
dev fix2
Merge branch 'dev'

Conflicts:
	test.cpp