bug fixes and added cve-2014-0196