Merge pull request #1750 from tokkee/sh/cli