Sync-commit
Merge branch 'hax' of github.com:KoRE0/KoRE into hax