Fixes #189
Merge pull request #195 from ovatsus/master

Fixes #189