Merge pull request #1334 from ztone/delegate