Fixing bad links to close #18