Setup fixes
Merge branch 'master' of https://github.com/vaslabs/pi-web-agent
Run fixes