Merged Config.cs changes from @Goldenheaven
Closes #103