Merge pull request #176 from jerv13/master

Basic plugin drag functionality
Merge remote-tracking branch 'upstream/master'