Feature: File name handling.
Demo: updated