modified to support file names that contain _e and _f
Merge pull request #35 from ballesterc/master

 modified to support file names that contain _e and _f