Fix bad super calls causing infinite recursion
Merge pull request #24 from leth/patch-1

Fix bad super calls causing infinite recursion