Use fancier words to make the point more clearly
Merge branch 'master' into edit-2