Added some features to the zoo module
Reworked some merge problem
Merge pull request #3 from mimipaskova/zoo-implement

Zoo implement