Add-Dreitser
Merge pull request #1836 from Dreitser/add-dreitser

Merging PR from @Dreitser