(Temporarily) fixed issue with file names with spaces (ref: #52)