Options: Uses null default instead of undefined.
Minor tweaks
Merge pull request #501 from kevva/minor-fixes

Minor tweaks