org test fixed
Merge pull request #483 from alda519/cli_fixed

org test fixed