Fixes #211
Merge pull request #213 from ovatsus/develop

Fixes #211