introduced a better approach at parsing on the fly.
Merge branch 'master' of https://github.com/picrin/webserver