Fix CVE-2014-3686
Merge pull request #14 from tigeli/CVE-2014-3686

Fix CVE-2014-3686