Merge remote-tracking branch 'upstream/master'
added squire btw
Merge remote-tracking branch 'upstream/master'
c