Added new security-layer, fixes #14