Fixes SA-CORE-2014-005
Merge pull request #87 from sexinfo/dev/mn/sec_fix

Fixes SA-CORE-2014-005