5.2.1 commit

Submitted changes by Katie as 5.2.1.
Merge pull request #3 from jalberts/5-2-1

5.2.1 commit