Merging Joshua Herr's changes on the command line.