solve overwritten
Merge branch 'master' of github.com:juda/animal
fixed some bug