Align code
Group highlights
Add git diffs
Merge pull request #1 from janko-m/master

Useful changes