Formatting

This changes everything
Merge pull request #30 from wiredearp/master

Formatting