Merge pull request #136 from kalkov/develop

Develop
Merge remote-tracking branch 'upstream/develop' into develop