Reordered table creation so a rebuild will work
Merge pull request #1 from dextius/master

Reordered table creation so a rebuild will work