Merge pull request #3 from bairyn/master

Wow that's a lot of stuff!
Minor doc update.
Set the error message when a session's attempt to change pages times out.
Merge remote branch 'upstream/master'