Use installer CR and CLI options where available
Merge pull request #27 from domcleal/use-installer-options

Use installer CR and CLI options where available