wami fixes
service unavailable
Merge branch 'master' of https://github.com/ypodo/prototype