fixed issue with options not being namespaced correctly in docs
Merge branch 'master' into gh-pages