Merge pull request #1 from marcevans/master

Fix styling issues.