Delegate initializations fixed. Switched to generic delegate types.
Merge pull request #21 from Avam/master

Delegate initializations