Remove infinite loops introduced with wrong use of 'super'
Merge pull request #93 from balshetzer/master

	Remove infinite loops introduced with wrong use of 'super'