Merge pull request #93 from californiavol/master

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

Merge pull request #93 from californiavol/master