Merge pull request #39 from Tradeshift/master

this.super + comments + cleanup