Add the contribution of Daerthox
Merge pull request #1285 from Daerthox/add-Daerthox

Merging PR from @Daerthox