Merge pull request #1 from johnpbloch/upstream

Fix word validation logic
Merge pull request #3 from johnpbloch/master

Add Composer Compatibility. Closes issue #2