Issue #57: Added controller code