Update entity.py
Merge pull request #46 from naor2013/master

Update entity.py