Merge pull request #139 from ouch-org/simplify-cli-canonicalize-input-treatment