nice method name
Merge remote-tracking branch 'origin/master'
updated with bad method name