rebased to 063fd40: added proper return of line number and occurence...