Handling better links followed by , . and so (fixes #8)