No longer vulnerable to SQL injection + more stuff

I guess..
No longer vulnerable to SQL injection + more stuff
Merge pull request #2 from vorhon/master

SQL Injection vulnerability fix