Merge pull request #142 from Tradeshift/master

this.super + comments + cleanup
Testing begins

It never ends.