Made a few changes to things and stuff and things
Merge remote-tracking branch 'origin/master'