Rebased with master , updated for chrome drag and drop