tj Merge pull request #14 from PlasmaPower/auto-delegate