Added new options, plus what it's for
Added --blank
Merge branch 'master' into testing