Merge pull request #9 from viktoriastadub/master-2

Master 2
Merge pull request #10 from viktoriastadub/master

Merge pull request #9 from viktoriastadub/master-2