Fixed support for files with same filename, added some special character support.