Add two convience functions for finding world points
Merge branch '29-query-facelift' into next