Several (huge) enhancements
Merge pull request #2 from Swop/security

Several (huge) enhancements