Merge "Add command line parser for simulator"