Merge pull request #199 from timschofield/develop

Develop
Simplify query