Did away with file type checking; fixes #18 and #22