Fixed issue: Fix security preamble and make it consistent in a few cases where it deviates
Merge pull request #309 from sergeyklay/master

Fixes