Merge pull request #3 from globeFrEak/dev

tables, locales
Merge pull request #4 from globeFrEak/master

ö