fix for Issue #394
Merge pull request #464 from githubCast/master

fix for Issue #394