Add waitAndGet methods to Query (refs #12)