Fixes #461
Merge pull request #462 from ovatsus/master

Fixes #461