Merge of Fredrik Hultin command_line