made some changes for plugins, updated string message
Merge branch 'develop'