Merge the files

I did it wrong, fixing it so I can PR to FerusGrim:Master