TEST add-goldenrod
Merge pull request #551 from goldenrod/add-goldenrod

Merging PR from @goldenrod