Got rid of the jokes
Merge remote-tracking branch 'origin/master'