Fixed link replacement (closes #15)