Merge pull request #26 from ZooTypers/master

getting the beta version
Merge pull request #28 from ZooTypers/master

getting new updates
commiting my minor changes
Merge pull request #143 from nhlien93/master

committing changes