Merge pull request #76 from californiavol/master

merge from master
Merge pull request #85 from californiavol/master

merge from master
Merge pull request #87 from californiavol/webs-web1dev

Webs web1dev