fixes
Merge remote-tracking branch 'upstream/master'
merging
phil is on a roll