adds guides
Merge branch 'versioned'