Include 'self' in the interface
Merge pull request #661 from alex/fix-interface

Include 'self' in the interface