Fixed bug for space in filename and extension...