fixes #144
Merge branch 'hotfix-attributes-not-mandatory' into dev