Added collection and preservation of outlinks. Fix #11