Updated instructions on how to use
Merge branch 'master' into of21x