Fixes issue #52 and removes the dead links