merged
update entities + fix bug
Merge pull request #1 from anhtuannguyentran/master

Merged