Little more style I guess
Merge remote-tracking branch 'origin'