Fixed table structure SQL
Merge branch 'development'