bugfixes
Merge branch 'master' of https://github.com/Bolt64/my_code

ty