Modification + Merge of Pulls #764 + #755

This pull puts together pulls [#764](https://github.com/visionmedia/express/pull/764) from @adrienbrault, [#755](https://github.com/visionmedia/express/pull/755) from @gdpotter and additional modifications missing from those pulls (such as  updating broken example code, and generating the documentation).