Merge pull request #4 from unikent/master

STABLE
Move more queries to params
Merge pull request #5 from unikent/fix/sql-injection-2

Fix/sql injection 2