Merge pull request #336 from katiewood/master

test query
Merge pull request #337 from katiewood/master

test query
Merge pull request #338 from katiewood/master

update code to test