Issue #8 - Removed encoding file names