Fixes CVE-2013-1854
Merge pull request #122 from jrgifford/fixing-cve-2013-1854

Fixes CVE-2013-1854