Merge pull request #276 from chrisyue/master

table name auto add underscore if entity name consists of more than two ...
small fix