improved Wikipedia regexp