Fixes #201
Merge pull request #213 from theponti/enhancement/items-form-partial-#201

Fixes #201
Merge pull request #214 from theponti/develop

Develop