V2 Mods

added new fields to entities and merged code
Merge pull request #7 from abrahamcm/master

V2 Mods