Style and Formatting
Merge pull request #60 from dawsondiaz/master

Style and Formatting