Merge "Slightly improve Doc's examples"