typing effect werkt
Merge origin/master