Merge pull request #14 from ZooTypers/master

Getting most recent version.
Merge pull request #15 from ZooTypers/master

Getting most recent version.
Merge pull request #16 from ZooTypers/master

Getting most recent version.
Fixing up the tests and manifest.
Merge pull request #227 from dyxliang/master

Pushing updates.