Refactor CLI, restart on config file changes 0.18.0