Update documentation of lookup method.

The documentation reflected pre #93 behaviour.
Merge branch '1.13' into 1.14
Merge branch '1.14' into 1.15