Merge pull request #11 from a1mueller/master

4/30 merge
Merge pull request #12 from a1mueller/Amy

Merge pull request #11 from a1mueller/master