added code for plugin
Merge branch 'fix_plugin'