Security vulnerabilities fixes Fixes #1