Formatting
Merge pull request #354 from jgho/formatting

Formatting