fix bug to close issue #92 and #152
correct wrong recognition of model key word in the middle of a line