Cleanup
Merge pull request #1 from alxdark/query2

Cleanup