test
Merge pull request #906 from Lichtjaeger/add-Lichtjaeger

Merging PR from @Lichtjaeger