updated Entity
Merge branch 'master' of https://github.com/klgilbert/avm