Resolving CVE-2013-0232 - this should fix #93.