Add setMarkedOptions
Merge branch 'master' into marked-options

Conflicts:
	lib/dox.js