Merge pull request #153 from InsomniaNY/3.0

Security Fix