Fixes #191
Merge pull request #194 from ovatsus/develop

Fixes #191