fix Issue #412
Merge pull request #452 from TrustNik/master

fix Issue #412