Merge pull request #427 from startling/passing-doctests

Fix ambiguous uses in doctests.
Fixed that last doctest.