Merged Dolnor's latest changes

Added default configuration value fallbacks