closed #14 edit controller update
Merge branch 'issue-14'