Merged WillHuxtable's changes (https://github.com/WillHuxtable/Neoforce-Mono/commit/29f7fb1495b4c7ece02cc65af16a09122e45607f)