Merge pull request #614 from nico/pooldoc