Several corrections.
Merge remote-tracking branch 'origin/master'
Organized imports and reformatted.