[SECURITY FIX] Fix CVE-2014-3483 and protect against CVE-2014-3482
Merge pull request #9 from mrkn/fix_sql_injection

Fix CVE-2014-3483 and protect against CVE-2014-3482