Merge pull request #2 from PeaceCorps/master

Merge pull request from PeaceCorps/master latest updates
Merge pull request #3 from systers/master

Merge pull request #2 from PeaceCorps/master