Merge pull request #355 from ovatsus/master

Fix for #310