Update for Comet
Update autoload
Merge remote-tracking branch 'origin/dev'