fix #55
merged configController conflict