Merge pull request #39 from Aintaer/master

Controller: allowing the (id, data) form