add more cases for 'self' usage
Merge pull request #2 from goodpeople/ernesto

add more cases for 'self' usage