Merge pull request #4 from graytl/Teresa-working-branch

Teresa working branch
Merge pull request #5 from graytl/master

Merge pull request #4 from graytl/Teresa-working-branch