Ajax attempt 1
Merge remote-tracking branch 'origin/master' into ajax

Merging with Alex's updates