Fixes #464
Merge pull request #467 from NielsZeilemaker/devel_maxlength

Fixes #464