Added check to prevent infinite loops via override()
Merge branch 'master' of github.com:jbroadway/elefant