Refactoring InputStream.
Merge branch 'master' of github.com:technosophos/HTML5-PHP