Merge pull request #89 from MPieter/master

FR 1.4: Security Fix