Fix CVE-2014-4671
Merge pull request #93 from justintv/master

Fix CVE-2014-4671