Issue #174 - Add controller