Debug controller
Merge pull request #284 from FWAJL/dev

Debug controller