code refactoring
Merge branch 'master' of github.com:dsspasov/ZOO
Merge branch 'master' of github.com:dsspasov/ZOO