enhanced drag and drop capabilities
Merge remote-tracking branch 'origin/master'