Commit me
Merge pull request #1838 from CapoDaster/add-CapoDaster

Merging PR from @CapoDaster