Optimising imports and removing blank lines at end of files
Merge remote-tracking branch 'origin/master'