Fixes #185
Merge pull request #196 from ovatsus/master

Fixes #185