Merge pull request #130 from Tradeshift/master

Accept this pull request, or else...
Formatting

This changes everything.
Merge pull request #131 from wiredearp/master

Formatting