Bugs fix: remove dir info from filename string
merge Bug-fix: remove dirname from filename