modified for second branch
Merge pull request #2 from vlatkokaplan/new_branch1

modified for second branch