Added preliminar support for comet
Resolved conflicts
Added a working Comet handler