Roger: fixed line wrapping issue; modified file input to support command line