add pull request from moritz-wundke and rashiqahmad