Merge pull request #2 from if-050java/master

entity add