diff --git a/src/stdlib/jquery-extensions.coffee b/src/stdlib/jquery-extensions.coffee
index fe403c2a9..95c882471 100644
--- a/src/stdlib/jquery-extensions.coffee
+++ b/src/stdlib/jquery-extensions.coffee
@@ -59,7 +59,12 @@ $.fn.trueHeight = ->
 $.fn.trueWidth = ->
   this[0].getBoundingClientRect().width
 
-$.fn.document = (eventDescriptions) ->
+$.fn.document = (eventDescriptions, optionalDoc) ->
+  if optionalDoc
+    eventName = eventDescriptions
+    eventDescriptions = {}
+    eventDescriptions[eventName] = optionalDoc
+
   @data('documentation', {}) unless @data('documentation')
   _.extend(@data('documentation'), eventDescriptions)
 
@@ -75,12 +80,26 @@ $.fn.events = ->
   else
     events
 
-$.fn.command = (args...) ->
-  eventName = args[0]
-  documentation = {}
-  documentation[eventName] = _.humanizeEventName(eventName)
-  @document(documentation)
-  @on(args...)
+# Valid calling styles:
+# command(eventName, handler)
+# command(eventName, selector, handler)
+# command(eventName, options, handler)
+# command(eventName, selector, options, handler)
+$.fn.command = (eventName, selector, options, handler) ->
+  if not options? and not handler?
+    handler  = selector
+    selector = null
+  else if not handler?
+    handler = options
+    options = null
+
+  if selector? and typeof(selector) is 'object'
+    handler  = options
+    options  = selector
+    selector = null
+
+  @document(eventName, _.humanizeEventName(eventName, options?["xxx"]))
+  @on(eventName, selector, options?['data'], handler)
 
 $.fn.iconSize = (size) ->
   @width(size).height(size).css('font-size', size)
diff --git a/src/stdlib/underscore-extensions.coffee b/src/stdlib/underscore-extensions.coffee
index df5865b24..824424099 100644
--- a/src/stdlib/underscore-extensions.coffee
+++ b/src/stdlib/underscore-extensions.coffee
@@ -52,10 +52,14 @@ _.mixin
     regex = RegExp('[' + specials.join('\\') + ']', 'g')
     string.replace(regex, "\\$&");
 
-  humanizeEventName: (eventName) ->
+  humanizeEventName: (eventName, optionalDocString) ->
+    return "GitHub" if eventName.toLowerCase() is "github"
+
     if /:/.test(eventName)
       [namespace, name] = eventName.split(':')
-      return "#{@humanizeEventName(namespace)}: #{@humanizeEventName(name)}"
+      return "#{@humanizeEventName(namespace)}: #{@humanizeEventName(name, optionalDocString)}"
+
+    return optionalDocString if not _.isEmpty(optionalDocString)
 
     words = eventName.split('-')
     words.map(_.capitalize).join(' ')