Closes #2. Added autocorrect flag on the validation. Added additional test cases.