added changes to branch 1
Merge pull request #1 from EdikHU/estr-newbranch1

added changes to branch 1