Merge branch 'develop' of https://github.com/tuommii/velkuri into develop
Merge branch 'develop' of https://github.com/tuommii/velkuri into develop