Security Fix
Merge pull request #105 from Vansers/dev

Security Fix