Fix the doctests. Fixes gh-7
Merge remote-tracking branch 'origin/master'