Do not override built-in methods
Merge pull request #1 from nobu/for-2.1

Do not override built-in methods