Merge pull request #94 from domob1812/enforce-value-length

Enforce value length