fix db + entities
fix Plugin
Merge pull request #30 from anhtuannguyentran/2.1.0

2.1.0