first commit, with buffer
web.js changes
merged web.js changes