fix drag&drop bug
Merge remote-tracking branch 'origin/master'
fixed size

add some comments