Fix merge
Add support for jQuery live() functions; improve commenting