improved Wikipedia regexp
Merge pull request #76 from alemela/devel_20140410b

improved Wikipedia regexp