Document options and fix typo
Merge branch 'master' into develop