fixed a few issues with cmd line
Merge pull request #8 from xilabs/luke-dev-11102013

fixed a few issues with cmd line