Merge pull request #1 from krisztian-szabo/develop

Develop