Updated entity module.
Merge pull request #20 from jordanlgraham/pita

Updated entity module.