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

Merging PR from @goldenrod