add changes to convert to web 3.0
Merge remote-tracking branch 'origin/master'