Merge pull request #121 from baraalex/master

task 3 completed and location changed