Fix: crashes because delegate not cleaned up properly
Fix: proper delegate cleanup
Merge pull request #6 from KingOfTheHuns/fix_delegate_issue

Fix: crashes because delegate not cleaned up properly