Merge pull request #131 from HaughtCodeworks/master

Bring V2.0 version from fork to main repository

Merge pull request #111 from rtyler/maxlength

Fix the failing test, validating against our increased maxlength