manual merge of https://github.com/mdipierro/web2py-book/pull/52, thanks krmr