Merge pull request #58 from dyxliang/master

Finalized Phase 2 for turn-in.
Merge pull request #16 from ZooTypers/master

Getting updates.