Merge pull request #6 from ChrisBoesch/master

update
update the controller for dnd
Merge pull request #39 from LI-HE/master

update the controller for dnd