Added more to the guide
Merge branch 'guide' into master-3.3