Merge pull request #1686 from sebweb3r/patch-1

More words