Another attempt to fix styling issues.
Merge pull request #3 from marcevans/master

Another attempt to fix styling issues.