fixed save plugin
Merge branch 'master' into production