Merge pull request #1 from anexation/master

fix drag drop state