Committing some final testing changes.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git