Updated names, and added long-polling.
Updated names, added long polling
Merge remote-tracking branch 'origin'