Make the queries 1 line.
Move more queries to 1 line.
Merge pull request #12 from nZEDb/dev

Dev