Merge pull request #3 from abaginska/my_own

commit from my own
commit master
Merge pull request #4 from abaginska/my_own

commit my_own
ours new (master)
changes in new