Improved the SQL
Merge branch 'develop'