Formatting changes
Merge pull request #1 from NateBarnes/master

Formatting changes