Modified tables structure
Merge branch 'master' of github.com:mohamed-anwar/Chalk