Merge pull request #42 from AmyWhitney/master

Changes made by edaza for Query crossing
Merge pull request #43 from AmyWhitney/feature

Merge pull request #42 from AmyWhitney/master