Jaimi Merge pull request #406 from umasteeringgroup/Feature-13