query editor
Merge pull request #7 from andrewknowles/work24102014

query editor