Merge pull request #975 from nico/docs