Fixes #399
Merge pull request #400 from lev-kuznetsov/master

Fixes #399