Merge pull request #1 from anikiforova/master

Looks good.
Add Max word length feature
Merge pull request #1 from jordanatlas/master

Getting jordan's changes.