Merge pull request #254 from zazuko/cli-base-path

Merge pull request #254 from zazuko/cli-base-path #126