Address CVE-2014-2665. Also closes issue #28
CVE-2014-2665