Merge pull request #7 from emrickgarrett/master

hhlep
Merge pull request #25 from caitlinvangundy/master

Merge pull request #7 from emrickgarrett/master