Updated some of Nick's code
Merge remote-tracking branch 'origin/master'