Merge pull request #12 from ZooTypers/d66a9776c7bb5d92f362ed68a859b0d3d9b8fc29

recent merging
finsihed testing
finished some tests
Merge pull request #105 from oaknguyen/master

testing merge