local modifications by VS
Merge branch 'master' of https://github.com/new299/onyxloader