shepherd review comments
Merge pull request #1 from legastero/psa

shepherd review comments