Improve pompadourlinks extension (Close #18)