replace andSelf()
Merge pull request #931 from lansi951/replace-andself

replace andSelf()