Changed to query from HDF for quicker performance. Added more tests
Merge pull request #15 from random-walk/bugfix

Changed to query from HDF for quicker performance. Added more tests