Merge pull request #74 from tshemsedinov/master

History and version changes from "master"
Fixed security plugin and minor code beautification
Merge pull request #75 from tshemsedinov/plugins

Cumulated stable updates from "plugins" branch #3