Merge pull request #112 from californiavol/master

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

Merge from master
Merge pull request #120 from californiavol/webs-web1dev

Webs web1dev