Update guide to be on par with the official one
Merge branch 'update_guide' into 'master'

Update guide

Let's follow upstream guide.