Scott's updates

disregard at the moment
Merge remote-tracking branch 'origin/master'