Drag / drop display loop added
Drag / drop display loop added
Merge remote-tracking branch 'origin/master'