Merge branch 'master' into develop

* master:
  Synced the buried documentation file with README
Added proper handling for .on() when [context] is passed as 3rd argument instead of [cancelCallback]
Merge branch 'develop'

* develop:
  Added proper handling for .on() when [context] is passed as 3rd argument instead of [cancelCallback]