adding a whole bunch of stuff
Merge remote-tracking branch 'upstream/master'