Merge pull request #19 from eparis/parse-rework

Parse rework