Zsombor Gegesy
Fix git rebase problems, and the failing doctest
e69126c