Merge branch 'zordok_test'
changing in test
merging with other branches
Merge pull request #2 from NellyAssem/branch1

changing in test