Refactor
Merge branch 'master' into spike_cli_with_autocomplete