Fix version 2.4.x
Merge pull request #24 from jeremy-derusse/fix-cve-2014-4931

Fix version 2.4.x for CVE-2014-4931