Backport fix for #163 into 0.11.0
Update documentation for fixes.
Add documentation for new options.
Merge pull request #369 from deanberris/0.11-devel-backport-163-patch

Backport fix for #163 into 0.11.0