Merge fix + Thumbs.db

conflicts