Improve parsing loop
Merge pull request #1 from labsl3/master

simple merge to keep up to date