Merge miren's branch (documentation)