#140 - ControllerEntry (review #161)

#140