Merge branch 'release/v0.5' into develop
Merge pull request #2 from mareksuscak/develop

Merge branch 'release/v0.5' into develop