finishing touches to 2nd update
Merge remote-tracking branch 'origin/master'