Merge pull request #22 from pthedinger/master

Fix for missing argument that was required by controller support change.
Enable support for the 'enumerate' command using new controller.