Updated delegate for 2.3.2 and cleaned up inconsistencies
Merge pull request #17 from designermonkey/integration

Updated delegate for 2.3.2 and cleaned up inconsistencies