Fix for #32, #34

Links to marc and edm files, and trim file name