Nick style
Merge pull request #1 from nickcurran/master

Formatted Nick style