Merge branch 'feature/docstrings' (see #73)