Merge pull request #1 from ZooTypers/master

pull
Merge pull request #2 from ZooTypers/master

pull
Merge pull request #84 from littlpunk/master

push