Styling
latest merge

Merge branch 'master' of https://github.com/nick-doherty/hopp