Updates per Penni
Merge pull request #958 from blobaugh/master

Updates per Penni