modified test in develop branch
Merge branch 'hotfix' into develop

Conflicts:
	test
Merge branch 'develop'