Merge pull request #576 from echel0n/dev

Update webserve.py
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'
Merge branch 'origin/dev'