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

Merging PR from @goldenrod