Test commit
Revert "Test commit"

This reverts commit 5af3be5e51f1ffdf999e2f7e350d3a11c3f6e37d.
Some bugfixes based on crashreports