Align parser with h2o better
Merge branch 'master' of github.com:0xdata/h2o-dev