more changes
Merge pull request #1 from mcalicdan/Miriam

more changes