Damm you super()
Merge pull request #294 from NielsZeilemaker/discoveryv1.3

Damm you super()