Restore working version
Merge branch 'master' of https://github.com/Fruchtkeks/X7OqBJPbNJwndMZvJ3jI