improve documentation
Merge branch '2-3-stable'