fix for #357
Merge pull request #364 from denzp/master

fix for #357