Add handling for CLI switch references (fixes #3)
Merge branch 'cli_switch'
Bump the version number