Lots of new updates
new
Merge remote-tracking branch 'origin/master'