#17 two URL linsk in one line or bullet list get mixed up
#17 Simpler change: don't be too greedy in matching output after URL
Merge remote-tracking branch 'origin/wikinize'