Merge pull request #1 from krisztian-szabo/develop

Develop
Merge pull request #2 from krisztian-szabo/master

Merge pull request #1 from krisztian-szabo/develop