Merge pull request #9 from viktoriastadub/master-2

Master 2