Merge pull request #654 from bvssvni/master

Added DragController
Fix bug