commit feature 3333 by shiga
Merge branch 'feature/3333' of github.com:n-tshiga/demo-1 into feature/3333

Conflicts:
	test.sh