Merge pull request #103 from californiavol/webs-web1dev

Merge pull request #102 from californiavol/master
Merge pull request #106 from californiavol/master

Merge pull request #103 from californiavol/webs-web1dev