hm2k Merge pull request #6 from dbratell/fix_security