Fix for command line retrieval
Merge pull request #26 from rnc/master

Fix for command line retrieval