Fix typo in default configuration file
Fix another typo in example configuration
Simplify and optimize schematic replacements
Fixed return values in run_client()
Merge branch 'master' into refactor_main