Merge pull request #8 from martakostova/develop

Develop