Updating so stuff can be run via command line
Merge remote-tracking branch 'origin/master'