Merge branch 'master'
Added command options
Merge branch 'scaffold_change'