Sanitization of all the data used in queries
Merge pull request #1 from nashe/patches

Sanitization of all the data used in queries - not part of original project