Fixed slowness during parsing
Merge pull request #1 from psaelens/master

Fixed slowness during parsing