Added correct searching schemes (Fixes #14)