merge changes
Merge pull request #15 from twhscs/abstract-entity

Abstract entity