Create ADMController. Issue #282
Merge with origin
Fix error of merge with origin