Fixes #9: updated validation rules