Redesigned --input argument, as detailed in issue #37