Allow free intermixing of options and input files (fixes #86)