updated options list in documentation [#2]
Merge branch 'docs' into develop