Pull into Romraider main

I deleted my fork and created a new fork from romraider. I re-committed my changes.