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

Merging PR from @goldenrod