sec
Merge pull request #654 from Lokiamis/Bleeding-Edge

Security remodeling again