Still fixing my method name change
Merge remote-tracking branch 'upstream/master'