Fixes the kind of problems reported on #75 but does break the command line "API" (hopefully).
Attach a file by drag & drop or click to upload