Fix subcommand discovery (closes issue #34)