Fix #1040 by allowing multiple files to be loaded from command line