Merge pull request #1 from web2py/web2py

pull request