Code update for Connor and Eric
Merge remote-tracking branch 'origin/master'
push for some changes.