Make UID field not required
Merge pull request #40 from pajcho/development

Make UID field not required