Merge pull request #490 from jeremygray/master

TEST: test contains / overlaps without needing nxutils