Revise joke
Merge branch 'fix-welcome'