remove comment
work 'drag file' and 'display old Viewer'
Merge remote-tracking branch 'origin/master'