Better options
Fixed defaults
Merge branch 'master' into complete