another round of changes
Merge pull request #3 from mcalicdan/Miriam

another round of changes