Fixes #537
Merge pull request #539 from ovatsus/master

Fixes #537