Merge branch 'master' of https://github.com/kobelb/web2