Fixed couple of bugs
Merge branch 'cmd_line_args'