Merge pull request #3 from ZooTypers/master

Getting updates.
Committing some new tests and fixing old ones.
Merge pull request #4 from ZooTypers/master

Getting updates.
Merge pull request #159 from dyxliang/master

Pull update.