Updates for Angelique and Emily (per emily's request)
Merge pull request #59 from Angelique-G/master

Updates for Angelique and Emily (per emily's request)