A shorter cmdline option, better option naming
better, shorter opt naming in ckiss script
Merge branch 'master' into collapse-background