Fixes #10; add support for number search