Merge pull request #3 from valiknet18/master

ZooLand
Merge pull request #7 from valiknet18/develop

add tests