Merge pull request #53 from ZooTypers/master

update
ran through codepro
Merge pull request #238 from nhlien93/master

ran through codepro
Merge pull request #45 from ZooTypers/master

final update!