Merge remote-tracking branch 'upstream/master'
Merge pull request #9 from Tradeshift/master

Merge remote-tracking branch 'upstream/master'