making live and adding ajac handling
Merge remote-tracking branch 'origin/master'