Added options not listed in the docs.
Added all default values for the options.
Merge pull request #87 from Jakobud/master

Added options not listed in the docs.