added some features
Merge branch 'master' of https://github.com/opendream/eph_animal
Merge branch 'master' of https://github.com/opendream/eph_animal
final version