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

Teresa working branch