Adding maxlength to the logic
Changing version
Merge branch 'develop'