fixed validation errors
fixed empty item
merge
Merge pull request #16 from OSN64/nig-devs

Nig devs