Re-added '_' in addition to '-' because of command line options interferance with prefixed '-'