Doctest fixes
Merge branch 'rizar' of github.com:bartvm/blocks into rizar