Merge pull request #82 from apache/security_checks

Added security checks: