Formatting
Merge pull request #40 from skraphog/patch-2

Formatting (See comments on merge thingy)