Merge branch 'westmann/docs'