added a close_plugin function
Merge remote-tracking branch 'origin/development' into development