Merge pull request #2 from gambol99/develop

wip
Merge pull request #3 from gambol99/develop

[feature]
[changes]
- adding the program_name to the base of the command
- removing the trailing spaces in the code