Merge branch 'westmann/doc'