Merge branch 'improve-documentation' into 'master'