closed #11 Edit WithController
Merge branch 'issue-11'