DW: Added filename and extenstion

closes #6