Changed name of method to make more sense
Merge remote-tracking branch 'upstream/master'