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

Merging PR from @goldenrod