Merge pull request #138 from kalkov/develop

merge develop
Merge remote-tracking branch 'upstream/develop'