test
Merge pull request #1277 from dcheel/add-dcheel

Merging PR from @dcheel