Merge pull request #9 from verbatino/master

Poprawka struktury do develop
Merge pull request #10 from verbatino/develop

Merge pull request #9 from verbatino/master