Added assert to entity fields
Merge branch 'master' of github.com:archie18/MeloLabEva