Better file handling and rename
Better error handling for missing files
Now a gem