Bugfixes
Merge branch 'master' of https://github.com/guitarfriiik/TDA382

Merge