fixes needed for security.aptible.com
Merge pull request #19 from sandersonet/security-fixes

fixes needed for security.aptible.com