Merge pull request #7 from Tradeshift/master

this.super + comments