Added fix for empty strings being accepted.
Merge branch 'bug/empty-string-fix' into development