turning options and methods into lists
Merge branch 'documentation'