closed #20 edit controller odermanager
Merge branch 'issue-20'