Feature/allow @ in the filenames