added options in the backend of the plugin and increased security.
Merge origin/master