Paar fixes
Merge branch 'master' of https://github.com/Bur0k/D45az