Most of #4
Merge pull request #5 from jbrooksuk/new-github-styles

Most of #4