corrected newlines and URL
Merge remote-tracking branch 'origin/master'
organise imports