Merge pull request #42 from AmyWhitney/master

Changes made by edaza for Query crossing