Base commit
Made the d_controller work again
Merge pull request #17 from matao/UpdateController

Update controller