style
Merge pull request #5 from jonathanhaggard/master

style