Merge pull request #465 from danvk/callback-this