lucahammer Merge pull request #243 from lucahammer/glitch