entity has some wrong.
something has wrong
Merge pull request #5 from pay-tong/devXxm

Dev xxm